Merge setup.cfg, tox.ini into pyproject.toml and use dependency groups #322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

dstansby merged 11 commits into matplotlib:main from samcunliffe:tox-ini-to-pyproject

Feb 2, 2026

Collaborator

samcunliffe commented Jan 6, 2026

A retry of

Merge setup.cfg into pyproject.toml and use dependency groups (#316) #318.

Should wait for

Require numpy 2.1 or newer in tests. Adopt SPEC-0 in the package. #321

samcunliffe and others added 5 commits

November 4, 2025 09:33


          Tox to pyproject.

792d9b5


          Merge setup.cfg into pyproject.toml and use dependency groups (matplo…

594f79d

…tlib#316)


          Rest of the pytest command with MPL extensions.

4fd667e


          tox-gh instead of tox-gh-actions. And add tox-uv for speed.

73eb7fd


          Fix reports dir for upload.

9926ae6

dstansby requested changes

View reviewed changes

Member

dstansby left a comment

Looks good overall - I spotted one typo, hence request changes, but the rest looks good 👍

pyproject.toml Outdated Show resolved Hide resolved

pyproject.toml Outdated Show resolved Hide resolved

pyproject.toml Outdated

+                  "tox",
+                  "pytest-xvfb; sys_platform == 'linux'",
+              ]
+              dev = [

Member

dstansby Feb 1, 2026

Could this instead be ["napari-matplotlib[test]", "napar-matplotlib[docs]"] to avoid duplication?

Collaborator Author

samcunliffe Feb 2, 2026

Yes, you can have that!

The syntax is a bit different. It would be:

dev = [
   {include-group = "test"},
   {include-group = "docs"},
]

but agree that we don't want to literally WET.

pyproject.toml Outdated Show resolved Hide resolved


          Typos

dcba5aa

Co-authored-by: David Stansby <dstansby@gmail.com>

samcunliffe commented

View reviewed changes

pyproject.toml Outdated Show resolved Hide resolved


          Use the include-group syntax rather than WET.

7d6329b

samcunliffe commented

View reviewed changes

pyproject.toml Outdated Show resolved Hide resolved

samcunliffe commented

View reviewed changes

pyproject.toml Show resolved Hide resolved

samcunliffe commented

View reviewed changes

pyproject.toml Outdated Show resolved Hide resolved

samcunliffe added 3 commits

February 2, 2026 11:18


          Remove optionals in favour of groups.

3fec310


          Merge remote-tracking branch 'origin/main' into tox-ini-to-pyproject


          Merge remote-tracking branch 'upstream/main' into tox-ini-to-pyproject

364461c

samcunliffe commented

View reviewed changes

pyproject.toml Show resolved Hide resolved


          Use dependency group in docs build too!

d703feb

samcunliffe marked this pull request as ready for review

February 2, 2026 11:27

samcunliffe requested a review from dstansby

February 2, 2026 11:28

samcunliffe self-assigned this

samcunliffe added the Maintenance label

dstansby approved these changes

View reviewed changes

dstansby merged commit 5b2a97c into matplotlib:main

12 checks passed

Collaborator Author

samcunliffe commented Feb 2, 2026

@jaideepkathiresan thanks for the contribution!

samcunliffe deleted the tox-ini-to-pyproject branch

February 2, 2026 11:32

samcunliffe mentioned this pull request

Merge setup.cfg into pyproject.toml and use dependency groups #316

Closed

3 tasks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels